From: tsteven4 <13596209+tsteven4@users.noreply.github.com> Date: Wed, 13 Nov 2024 16:58:25 +0000 (-0700) Subject: fix tidy modernize-use-override (#1380) X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2^2~9 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6a9f953acc3acc47064bd2cbdf94747252c6a578;p=gpsbabel.git fix tidy modernize-use-override (#1380) --- diff --git a/gui/filterdata.h b/gui/filterdata.h index d61201d23..9bde74b8a 100644 --- a/gui/filterdata.h +++ b/gui/filterdata.h @@ -79,7 +79,7 @@ public: startTime = stopTime.addMonths(-6); startTime.setTime(QTime(0, 0, 1)); } - virtual void makeSettingGroup(SettingGroup& sg) + void makeSettingGroup(SettingGroup& sg) override { sg.addVarSetting(new BoolSetting("trks.inUse", inUse_)); sg.addVarSetting(new BoolSetting("trks.GPSFixes", GPSFixes)); @@ -111,7 +111,7 @@ public: sg.addVarSetting(new IntSetting("trks.splitDist", splitDist)); sg.addVarSetting(new IntSetting("trks.splitDistUnit", splitDistUnit)); } - virtual QStringList makeOptionString(); + QStringList makeOptionString() override; public: bool title; @@ -146,8 +146,8 @@ public: { } - virtual QStringList makeOptionString(); - virtual void makeSettingGroup(SettingGroup& sg) + QStringList makeOptionString() override; + void makeSettingGroup(SettingGroup& sg) override { sg.addVarSetting(new BoolSetting("wpts.inUse", inUse_)); sg.addVarSetting(new BoolSetting("wpts.radius", radius)); @@ -183,8 +183,8 @@ public: { } - virtual QStringList makeOptionString(); - virtual void makeSettingGroup(SettingGroup& sg) + QStringList makeOptionString() override; + void makeSettingGroup(SettingGroup& sg) override { sg.addVarSetting(new BoolSetting("rttrk.inUse", inUse_)); sg.addVarSetting(new BoolSetting("rttrk.reverse", reverse_)); @@ -218,8 +218,8 @@ public: { } - virtual QStringList makeOptionString(); - virtual void makeSettingGroup(SettingGroup& sg) + QStringList makeOptionString() override; + void makeSettingGroup(SettingGroup& sg) override { sg.addVarSetting(new BoolSetting("mscflt.nukeRoutes", nukeRoutes_)); sg.addVarSetting(new BoolSetting("mscflt.nukeTracks", nukeTracks_)); diff --git a/gui/filterwidgets.h b/gui/filterwidgets.h index 7de8ea1ec..571c914c1 100644 --- a/gui/filterwidgets.h +++ b/gui/filterwidgets.h @@ -117,11 +117,11 @@ public: BoolFilterOption(bool& b, QAbstractButton* ck): b(b), checkBox(ck) { } - void setWidgetValue() + void setWidgetValue() override { checkBox->setChecked(b); } - void getWidgetValue() + void getWidgetValue() override { b = checkBox->isChecked(); } @@ -139,11 +139,11 @@ public: { sb->setRange(bottom, top); } - void setWidgetValue() + void setWidgetValue() override { spinBox->setValue(val); } - void getWidgetValue() + void getWidgetValue() override { val = spinBox->value(); } @@ -160,11 +160,11 @@ public: StringFilterOption(QString& val, QLineEdit* le): val(val), lineEdit(le) { } - void setWidgetValue() + void setWidgetValue() override { lineEdit->setText(val); } - void getWidgetValue() + void getWidgetValue() override { val = lineEdit->text(); } @@ -188,11 +188,11 @@ public: { le->setValidator(new QDoubleValidator(minVal, maxVal, decimals, le)); } - void setWidgetValue() + void setWidgetValue() override { lineEdit->setText(QString("%1").arg(val, 0, format, decimals)); } - void getWidgetValue() + void getWidgetValue() override { val = lineEdit->text().toDouble(); val = qMin(val, maxVal); @@ -214,11 +214,11 @@ public: DateTimeFilterOption(QDateTime& val, QDateTimeEdit* w): val(val), w(w) { } - void setWidgetValue() + void setWidgetValue() override { w->setDateTime(val); } - void getWidgetValue() + void getWidgetValue() override { val = w->dateTime(); } @@ -235,11 +235,11 @@ public: ComboFilterOption(int& val, QComboBox* w): val(val), w(w) { } - void setWidgetValue() + void setWidgetValue() override { w->setCurrentIndex(val); } - void getWidgetValue() + void getWidgetValue() override { val = w->currentIndex(); } @@ -302,7 +302,7 @@ class TrackWidget: public FilterWidget public: TrackWidget(QWidget* parent, TrackFilterData& tf); - virtual void checkChecks() + void checkChecks() override { otherCheckX(); FilterWidget::checkChecks(); diff --git a/gui/mainwindow.h b/gui/mainwindow.h index 78ba6ee32..641955577 100644 --- a/gui/mainwindow.h +++ b/gui/mainwindow.h @@ -108,8 +108,8 @@ private: QString getFormatNameForExtension(const QString& ext); protected: - void closeEvent(QCloseEvent*); - void changeEvent(QEvent*); + void closeEvent(QCloseEvent*) override; + void changeEvent(QEvent*) override; private slots: void aboutActionX(); @@ -118,8 +118,8 @@ private slots: void browseOutputFile(); void closeActionX(); void donateActionX(); - void dragEnterEvent(QDragEnterEvent*); - void dropEvent(QDropEvent* event); + void dragEnterEvent(QDragEnterEvent*) override; + void dropEvent(QDropEvent* event) override; void filtersClicked(); void helpActionX(); void inputDeviceOptBtnClicked(); diff --git a/gui/map.h b/gui/map.h index 6c2e69b7a..892a3e840 100644 --- a/gui/map.h +++ b/gui/map.h @@ -132,7 +132,7 @@ private: protected: - virtual void resizeEvent(QResizeEvent* event); + void resizeEvent(QResizeEvent* event) override; }; diff --git a/gui/setting.h b/gui/setting.h index 9a770450e..28bb13b5b 100644 --- a/gui/setting.h +++ b/gui/setting.h @@ -44,11 +44,11 @@ class IntSetting: public VarSetting { public: IntSetting(const QString& name, int& var): name_(name), var_(var) { } - void saveSetting(QSettings& st) + void saveSetting(QSettings& st) override { st.setValue(name_, var_); } - void restoreSetting(QSettings& st) + void restoreSetting(QSettings& st) override { if (st.contains(name_)) { var_ = st.value(name_).toInt(); @@ -65,11 +65,11 @@ class DoubleSetting: public VarSetting { public: DoubleSetting(const QString& name, double& var): name_(name), var_(var) { } - void saveSetting(QSettings& st) + void saveSetting(QSettings& st) override { st.setValue(name_, var_); } - void restoreSetting(QSettings& st) + void restoreSetting(QSettings& st) override { if (st.contains(name_)) { var_ = st.value(name_).toDouble(); @@ -86,11 +86,11 @@ class StringSetting: public VarSetting { public: StringSetting(const QString& name, QString& var): name_(name), var_(var) { } - void saveSetting(QSettings& st) + void saveSetting(QSettings& st) override { st.setValue(name_, var_); } - void restoreSetting(QSettings& st) + void restoreSetting(QSettings& st) override { if (st.contains(name_)) { var_ = st.value(name_).toString(); @@ -107,11 +107,11 @@ class BoolSetting: public VarSetting { public: BoolSetting(const QString& name, bool& var): name_(name), var_(var) { } - void saveSetting(QSettings& st) + void saveSetting(QSettings& st) override { st.setValue(name_, var_); } - void restoreSetting(QSettings& st) + void restoreSetting(QSettings& st) override { if (st.contains(name_)) { var_ = st.value(name_).toBool(); @@ -128,11 +128,11 @@ class DateTimeSetting: public VarSetting { public: DateTimeSetting(const QString& name, QDateTime& var): name_(name), var_(var) { } - void saveSetting(QSettings& st) + void saveSetting(QSettings& st) override { st.setValue(name_, var_); } - void restoreSetting(QSettings& st) + void restoreSetting(QSettings& st) override { if (st.contains(name_)) { var_ = st.value(name_).toDateTime();